|
@@ -1148,11 +1148,11 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
|
1148
|
1148
|
PreImpulse: pre_impulse,
|
1149
|
1149
|
AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
|
1150
|
1150
|
AnticoagulantStopTimeMin: anticoagulant_stop_time_min,
|
1151
|
|
- Blood: blood,
|
1152
|
|
- DialysisDialyszers: dialysis_dialyszers,
|
1153
|
|
- DialysisIrrigation: dialysis_irrigation,
|
1154
|
|
- AntioxidantCommodityName: antioxidant_commodity_name,
|
1155
|
|
- DisplaceSpeed: displace_speed,
|
|
1151
|
+ Blood: blood,
|
|
1152
|
+ DialysisDialyszers: dialysis_dialyszers,
|
|
1153
|
+ DialysisIrrigation: dialysis_irrigation,
|
|
1154
|
+ AntioxidantCommodityName: antioxidant_commodity_name,
|
|
1155
|
+ DisplaceSpeed: displace_speed,
|
1156
|
1156
|
}
|
1157
|
1157
|
|
1158
|
1158
|
_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
|
|
@@ -1963,11 +1963,11 @@ func (c *DialysisAPIController) PostSolution() {
|
1963
|
1963
|
ALiquid: a_liquid,
|
1964
|
1964
|
AnticoagulantStopTimeMin: anticoagulant_stop_time_min,
|
1965
|
1965
|
AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
|
1966
|
|
- Blood: blood,
|
1967
|
|
- DialysisDialyszers: dialysis_dialyszers,
|
1968
|
|
- DialysisIrrigation: dialysis_irrigation,
|
1969
|
|
- AntioxidantCommodityName: antioxidant_commodity_name,
|
1970
|
|
- DisplaceSpeed: displace_speed,
|
|
1966
|
+ Blood: blood,
|
|
1967
|
+ DialysisDialyszers: dialysis_dialyszers,
|
|
1968
|
+ DialysisIrrigation: dialysis_irrigation,
|
|
1969
|
+ AntioxidantCommodityName: antioxidant_commodity_name,
|
|
1970
|
+ DisplaceSpeed: displace_speed,
|
1971
|
1971
|
}
|
1972
|
1972
|
|
1973
|
1973
|
_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
|
|
@@ -2813,20 +2813,31 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
|
2813
|
2813
|
}
|
2814
|
2814
|
}
|
2815
|
2815
|
|
2816
|
|
- advices = append(advices, &advice)
|
|
2816
|
+ temp_advice, _ := service.FindRemindAdvice(advice.UserOrgId, advice.AdviceName, advice.AdviceDesc, advice.TemplateId, advice.FrequencyType, patient, advice.RecordDate)
|
|
2817
|
+ if temp_advice.ID == 0 {
|
|
2818
|
+ advices = append(advices, &advice)
|
|
2819
|
+ }
|
2817
|
2820
|
}
|
2818
|
2821
|
|
2819
|
|
- list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
|
|
2822
|
+ if len(advices) > 0 {
|
|
2823
|
+ list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
|
2820
|
2824
|
|
2821
|
|
- if err != nil {
|
2822
|
|
- c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
|
2823
|
|
- return
|
2824
|
|
- }
|
|
2825
|
+ if err != nil {
|
|
2826
|
+ c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
|
|
2827
|
+ return
|
|
2828
|
+ }
|
2825
|
2829
|
|
2826
|
|
- c.ServeSuccessJSON(map[string]interface{}{
|
2827
|
|
- "msg": "ok",
|
2828
|
|
- "advices": list,
|
2829
|
|
- })
|
|
2830
|
+ c.ServeSuccessJSON(map[string]interface{}{
|
|
2831
|
+ "msg": "ok",
|
|
2832
|
+ "advices": list,
|
|
2833
|
+ })
|
|
2834
|
+
|
|
2835
|
+ } else {
|
|
2836
|
+ c.ServeSuccessJSON(map[string]interface{}{
|
|
2837
|
+ "msg": "ok",
|
|
2838
|
+ })
|
|
2839
|
+
|
|
2840
|
+ }
|
2830
|
2841
|
|
2831
|
2842
|
return
|
2832
|
2843
|
|