diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index 70931f2..81273a2 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -3,103 +3,102 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId},#{synStatus},#{isOld})
-
- update patient_service
- parentid = #{parentid,jdbcType=VARCHAR},
-
-
- pid = #{pid,jdbcType=VARCHAR},
-
-
- ser_type = #{serType,jdbcType=INTEGER},
-
-
+ update patient_service
+
ser_doct = #{serDoct,jdbcType=VARCHAR},
-
-
- create_date = #{createDate,jdbcType=TIMESTAMP},
-
-
- create_user_name = #{createUserName,jdbcType=VARCHAR},
-
-
- create_user = #{createUser,jdbcType=VARCHAR},
-
-
- ser_status = #{serStatus,jdbcType=INTEGER},
-
-
- update_date = #{updateDate,jdbcType=TIMESTAMP},
-
-
- update_user_name = #{updateUserName,jdbcType=VARCHAR},
-
-
- update_user = #{updateUser,jdbcType=VARCHAR},
-
-
- hospital_id = #{hospitalId,jdbcType=VARCHAR},
-
-
- ser_code = #{serCode,jdbcType=VARCHAR},
-
-
- status = #{status,jdbcType=INTEGER},
-
-
- receive_date = #{receiveDate,jdbcType=TIMESTAMP},
-
-
- receive_user = #{receiveUser,jdbcType=VARCHAR},
-
-
- back_date = #{backDate,jdbcType=TIMESTAMP},
-
-
- back_user = #{backUser,jdbcType=VARCHAR},
-
-
- order_id = #{orderId,jdbcType=VARCHAR},
-
-
- syn_status = #{synStatus,jdbcType=INTEGER},
-
-
- is_old = #{isOld,jdbcType=INTEGER},
-
-
+
+ parentid = #{parentid,jdbcType=VARCHAR},
+
+
+ pid = #{pid,jdbcType=VARCHAR},
+
+
+ ser_type = #{serType,jdbcType=INTEGER},
+
+
+
+ create_date = #{createDate,jdbcType=TIMESTAMP},
+
+
+ create_user_name = #{createUserName,jdbcType=VARCHAR},
+
+
+ create_user = #{createUser,jdbcType=VARCHAR},
+
+
+ ser_status = #{serStatus,jdbcType=INTEGER},
+
+
+ update_date = #{updateDate,jdbcType=TIMESTAMP},
+
+
+ update_user_name = #{updateUserName,jdbcType=VARCHAR},
+
+
+ update_user = #{updateUser,jdbcType=VARCHAR},
+
+
+ hospital_id = #{hospitalId,jdbcType=VARCHAR},
+
+
+ ser_code = #{serCode,jdbcType=VARCHAR},
+
+
+ status = #{status,jdbcType=INTEGER},
+
+
+ receive_date = #{receiveDate,jdbcType=TIMESTAMP},
+
+
+ receive_user = #{receiveUser,jdbcType=VARCHAR},
+
+
+ back_date = #{backDate,jdbcType=TIMESTAMP},
+
+
+ back_user = #{backUser,jdbcType=VARCHAR},
+
+
+ order_id = #{orderId,jdbcType=VARCHAR},
+
+
+ syn_status = #{synStatus,jdbcType=INTEGER},
+
+
+ is_old = #{isOld,jdbcType=INTEGER},
+
+
where id = #{id,jdbcType=VARCHAR}
@@ -109,7 +108,6 @@
-
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
index a6fc847..7c28a2f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
@@ -55,20 +55,19 @@ public class PatientServiceSysFacade implements SysBaseFacade {
//先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
PatientServiceQuery patientQuery = new PatientServiceQuery();
- //开通医院
- // patientQuery.setHospitalId(patientService.getHospitalId());
//根据孕妇主档案Id进行查询
patientQuery.setParentid(patientService.getParentid());
//开通服务
patientQuery.setSerType(patientService.getSerType());
- //开通医院
- // patientQuery.setHospitalId(patientService.getHospitalId());
List patientServices = patientServiceService.queryPatientService(patientQuery);
if (CollectionUtils.isNotEmpty(patientServices)) {//修改
PatientService ps = patientServices.get(0);
ps.setSerStatus(patientService.getSerStatus());
ps.setSerCode(patientService.getSerCode());
ps.setOrderId(patientService.getOrderId());
+ ps.setSerDoct(patientService.getSerDoct());
+ ps.setHospitalId(patientService.getHospitalId());
+ //操作时间
ps.setUpdateDate(new Date());
patientServiceService.updatePatientService(ps);
} else {//新增