study

dr_study_idl.proto

@@ -42,19 +42,20 @@ message StudyRequest {
   string patient_age = 5;
   google.protobuf.Timestamp patient_dob = 6;
   string patient_sex = 7;
-  string patient_type = 8;
-  string ref_physician = 9; //兽医师
-  string operator_id = 10;
-  string modality = 11;
-  int32 weight = 12;
-  int32 thickness = 13;
-  int32 length = 14;
-  string study_type = 15;
-  string chip_number = 16;
-  string variety = 17; //品种描述
-  string pregnancy_status = 18; //妊娠状态
-  string comment = 19; //备注
-  repeated ViewRequest views = 20;
+  string sex_neutered = 8;
+  string pregnancy_status = 9; //妊娠状态
+  string patient_type = 10;
+  string ref_physician = 11; //兽医师
+  string operator_id = 12;
+  string modality = 13;
+  int32 weight = 14;
+  int32 thickness = 15;
+  int32 length = 16;
+  string study_type = 17;
+  string chip_number = 18;
+  string variety = 19; //品种描述
+  string comment = 20; //备注
+  repeated ViewRequest views = 21;
 }
 
 message Image {

dr_study_pb/dr_study_idl.pb.go

@@ -239,19 +239,20 @@ type StudyRequest struct {
 	PatientAge      string                 `protobuf:"bytes,5,opt,name=patient_age,json=patientAge,proto3" json:"patient_age,omitempty"`
 	PatientDob      *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=patient_dob,json=patientDob,proto3" json:"patient_dob,omitempty"`
 	PatientSex      string                 `protobuf:"bytes,7,opt,name=patient_sex,json=patientSex,proto3" json:"patient_sex,omitempty"`
-	PatientType     string                 `protobuf:"bytes,8,opt,name=patient_type,json=patientType,proto3" json:"patient_type,omitempty"`
-	RefPhysician    string                 `protobuf:"bytes,9,opt,name=ref_physician,json=refPhysician,proto3" json:"ref_physician,omitempty"` //兽医师
-	OperatorId      string                 `protobuf:"bytes,10,opt,name=operator_id,json=operatorId,proto3" json:"operator_id,omitempty"`
-	Modality        string                 `protobuf:"bytes,11,opt,name=modality,proto3" json:"modality,omitempty"`
-	Weight          int32                  `protobuf:"varint,12,opt,name=weight,proto3" json:"weight,omitempty"`
-	Thickness       int32                  `protobuf:"varint,13,opt,name=thickness,proto3" json:"thickness,omitempty"`
-	Length          int32                  `protobuf:"varint,14,opt,name=length,proto3" json:"length,omitempty"`
-	StudyType       string                 `protobuf:"bytes,15,opt,name=study_type,json=studyType,proto3" json:"study_type,omitempty"`
-	ChipNumber      string                 `protobuf:"bytes,16,opt,name=chip_number,json=chipNumber,proto3" json:"chip_number,omitempty"`
-	Variety         string                 `protobuf:"bytes,17,opt,name=variety,proto3" json:"variety,omitempty"`                                        //品种描述
-	PregnancyStatus string                 `protobuf:"bytes,18,opt,name=pregnancy_status,json=pregnancyStatus,proto3" json:"pregnancy_status,omitempty"` //妊娠状态
-	Comment         string                 `protobuf:"bytes,19,opt,name=comment,proto3" json:"comment,omitempty"`                                        //备注
-	Views           []*ViewRequest         `protobuf:"bytes,20,rep,name=views,proto3" json:"views,omitempty"`
+	SexNeutered     string                 `protobuf:"bytes,8,opt,name=sex_neutered,json=sexNeutered,proto3" json:"sex_neutered,omitempty"`
+	PregnancyStatus string                 `protobuf:"bytes,9,opt,name=pregnancy_status,json=pregnancyStatus,proto3" json:"pregnancy_status,omitempty"` //妊娠状态
+	PatientType     string                 `protobuf:"bytes,10,opt,name=patient_type,json=patientType,proto3" json:"patient_type,omitempty"`
+	RefPhysician    string                 `protobuf:"bytes,11,opt,name=ref_physician,json=refPhysician,proto3" json:"ref_physician,omitempty"` //兽医师
+	OperatorId      string                 `protobuf:"bytes,12,opt,name=operator_id,json=operatorId,proto3" json:"operator_id,omitempty"`
+	Modality        string                 `protobuf:"bytes,13,opt,name=modality,proto3" json:"modality,omitempty"`
+	Weight          int32                  `protobuf:"varint,14,opt,name=weight,proto3" json:"weight,omitempty"`
+	Thickness       int32                  `protobuf:"varint,15,opt,name=thickness,proto3" json:"thickness,omitempty"`
+	Length          int32                  `protobuf:"varint,16,opt,name=length,proto3" json:"length,omitempty"`
+	StudyType       string                 `protobuf:"bytes,17,opt,name=study_type,json=studyType,proto3" json:"study_type,omitempty"`
+	ChipNumber      string                 `protobuf:"bytes,18,opt,name=chip_number,json=chipNumber,proto3" json:"chip_number,omitempty"`
+	Variety         string                 `protobuf:"bytes,19,opt,name=variety,proto3" json:"variety,omitempty"` //品种描述
+	Comment         string                 `protobuf:"bytes,20,opt,name=comment,proto3" json:"comment,omitempty"` //备注
+	Views           []*ViewRequest         `protobuf:"bytes,21,rep,name=views,proto3" json:"views,omitempty"`
 	unknownFields   protoimpl.UnknownFields
 	sizeCache       protoimpl.SizeCache
 }
@@ -335,6 +336,20 @@ func (x *StudyRequest) GetPatientSex() string {
 	return ""
 }
 
+func (x *StudyRequest) GetSexNeutered() string {
+	if x != nil {
+		return x.SexNeutered
+	}
+	return ""
+}
+
+func (x *StudyRequest) GetPregnancyStatus() string {
+	if x != nil {
+		return x.PregnancyStatus
+	}
+	return ""
+}
+
 func (x *StudyRequest) GetPatientType() string {
 	if x != nil {
 		return x.PatientType
@@ -405,13 +420,6 @@ func (x *StudyRequest) GetVariety() string {
 	return ""
 }
 
-func (x *StudyRequest) GetPregnancyStatus() string {
-	if x != nil {
-		return x.PregnancyStatus
-	}
-	return ""
-}
-
 func (x *StudyRequest) GetComment() string {
 	if x != nil {
 		return x.Comment
@@ -1113,7 +1121,7 @@ const file_dr_study_idl_proto_rawDesc = "" +
 	"\aversion\x18\x04 \x01(\tR\aversion\"I\n" +
 	"\vViewRequest\x12\x17\n" +
 	"\aview_id\x18\x01 \x01(\tR\x06viewId\x12!\n" +
-	"\fprocedure_id\x18\x02 \x01(\tR\vprocedureId\"\xbc\x05\n" +
+	"\fprocedure_id\x18\x02 \x01(\tR\vprocedureId\"\xdf\x05\n" +
 	"\fStudyRequest\x12)\n" +
 	"\x10accession_number\x18\x01 \x01(\tR\x0faccessionNumber\x12\x1d\n" +
 	"\n" +
@@ -1126,23 +1134,24 @@ const file_dr_study_idl_proto_rawDesc = "" +
 	"patientDob\x12\x1f\n" +
 	"\vpatient_sex\x18\a \x01(\tR\n" +
 	"patientSex\x12!\n" +
-	"\fpatient_type\x18\b \x01(\tR\vpatientType\x12#\n" +
-	"\rref_physician\x18\t \x01(\tR\frefPhysician\x12\x1f\n" +
-	"\voperator_id\x18\n" +
-	" \x01(\tR\n" +
+	"\fsex_neutered\x18\b \x01(\tR\vsexNeutered\x12)\n" +
+	"\x10pregnancy_status\x18\t \x01(\tR\x0fpregnancyStatus\x12!\n" +
+	"\fpatient_type\x18\n" +
+	" \x01(\tR\vpatientType\x12#\n" +
+	"\rref_physician\x18\v \x01(\tR\frefPhysician\x12\x1f\n" +
+	"\voperator_id\x18\f \x01(\tR\n" +
 	"operatorId\x12\x1a\n" +
-	"\bmodality\x18\v \x01(\tR\bmodality\x12\x16\n" +
-	"\x06weight\x18\f \x01(\x05R\x06weight\x12\x1c\n" +
-	"\tthickness\x18\r \x01(\x05R\tthickness\x12\x16\n" +
-	"\x06length\x18\x0e \x01(\x05R\x06length\x12\x1d\n" +
+	"\bmodality\x18\r \x01(\tR\bmodality\x12\x16\n" +
+	"\x06weight\x18\x0e \x01(\x05R\x06weight\x12\x1c\n" +
+	"\tthickness\x18\x0f \x01(\x05R\tthickness\x12\x16\n" +
+	"\x06length\x18\x10 \x01(\x05R\x06length\x12\x1d\n" +
 	"\n" +
-	"study_type\x18\x0f \x01(\tR\tstudyType\x12\x1f\n" +
-	"\vchip_number\x18\x10 \x01(\tR\n" +
+	"study_type\x18\x11 \x01(\tR\tstudyType\x12\x1f\n" +
+	"\vchip_number\x18\x12 \x01(\tR\n" +
 	"chipNumber\x12\x18\n" +
-	"\avariety\x18\x11 \x01(\tR\avariety\x12)\n" +
-	"\x10pregnancy_status\x18\x12 \x01(\tR\x0fpregnancyStatus\x12\x18\n" +
-	"\acomment\x18\x13 \x01(\tR\acomment\x12+\n" +
-	"\x05views\x18\x14 \x03(\v2\x15.dr.study.ViewRequestR\x05views\"\xe2\x03\n" +
+	"\avariety\x18\x13 \x01(\tR\avariety\x12\x18\n" +
+	"\acomment\x18\x14 \x01(\tR\acomment\x12+\n" +
+	"\x05views\x18\x15 \x03(\v2\x15.dr.study.ViewRequestR\x05views\"\xe2\x03\n" +
 	"\x05Image\x12&\n" +
 	"\x0fsop_instance_id\x18\x01 \x01(\tR\rsopInstanceId\x12.\n" +
 	"\x13series_instance_uid\x18\x02 \x01(\tR\x11seriesInstanceUid\x12,\n" +