diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
index 7eaf745..bb955e6 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
@@ -100,7 +100,118 @@ public class PatientService {
*/
private Integer isOld;
- private Integer serviceWeek;
+
+ private Integer device;
+ private Integer deviceCon;//'设备条件';
+
+ private Integer doctorWeek;//'医生购买周数';
+
+ private Integer serviceWeek;//'服务购买周数';
+
+ private Integer serStartWeek;//'服务开始周数';
+
+ private Integer serEndWeek;//'服务结束周数';
+
+
+ private Date serStartTime;//'服务开始时间';
+
+ private Date serEndTime;//'服务结束时间';
+
+ private Integer docStartWeek;//'医生开始周数';
+
+ private Integer docEndWeek;//'医生结束周数';
+
+ private Date docStartTime;//'医生开始时间';
+
+ private Date docEndTime;//'医生结束时间';
+
+ public Integer getDevice() {
+ return device;
+ }
+
+ public void setDevice(Integer device) {
+ this.device = device;
+ }
+
+ public Integer getDeviceCon() {
+ return deviceCon;
+ }
+
+ public void setDeviceCon(Integer deviceCon) {
+ this.deviceCon = deviceCon;
+ }
+
+ public Integer getDoctorWeek() {
+ return doctorWeek;
+ }
+
+ public void setDoctorWeek(Integer doctorWeek) {
+ this.doctorWeek = doctorWeek;
+ }
+
+ public Integer getSerStartWeek() {
+ return serStartWeek;
+ }
+
+ public void setSerStartWeek(Integer serStartWeek) {
+ this.serStartWeek = serStartWeek;
+ }
+
+ public Integer getSerEndWeek() {
+ return serEndWeek;
+ }
+
+ public void setSerEndWeek(Integer serEndWeek) {
+ this.serEndWeek = serEndWeek;
+ }
+
+ public Date getSerStartTime() {
+ return serStartTime;
+ }
+
+ public void setSerStartTime(Date serStartTime) {
+ this.serStartTime = serStartTime;
+ }
+
+ public Date getSerEndTime() {
+ return serEndTime;
+ }
+
+ public void setSerEndTime(Date serEndTime) {
+ this.serEndTime = serEndTime;
+ }
+
+ public Integer getDocStartWeek() {
+ return docStartWeek;
+ }
+
+ public void setDocStartWeek(Integer docStartWeek) {
+ this.docStartWeek = docStartWeek;
+ }
+
+ public Integer getDocEndWeek() {
+ return docEndWeek;
+ }
+
+ public void setDocEndWeek(Integer docEndWeek) {
+ this.docEndWeek = docEndWeek;
+ }
+
+ public Date getDocStartTime() {
+ return docStartTime;
+ }
+
+ public void setDocStartTime(Date docStartTime) {
+ this.docStartTime = docStartTime;
+ }
+
+ public Date getDocEndTime() {
+ return docEndTime;
+ }
+
+ public void setDocEndTime(Date docEndTime) {
+ this.docEndTime = docEndTime;
+ }
public Integer getServiceWeek() {
return serviceWeek;
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 0628adc..b79a196 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -30,7 +30,36 @@
- 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,per_type) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId},#{synStatus},#{isOld},#{perType})
+ 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,
+ per_type
+ ,device
+ ,deviceCon
+ ,doctorWeek
+ ,serviceWeek
+ ,serStartWeek
+ ,serEndWeek
+ ,serStartTime
+ ,serEndTime
+ ,docStartWeek
+ ,docEndWeek
+ ,docStartTime
+ ,docEndTime
+ ) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},
+ #{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId},#{synStatus},#{isOld},#{perType}
+ , #{device}
+ , #{deviceCon}
+ , #{doctorWeek}
+ , #{serviceWeek}
+ , #{serStartWeek}
+ , #{serEndWeek}
+ , #{serStartTime}
+ , #{serEndTime}
+ , #{docStartWeek}
+ , #{docEndWeek}
+ , #{docStartTime}
+ , #{docEndTime}
+ )
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TServiceTimeRecord.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TServiceTimeRecord.java
index 117e51f..098d74a 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/TServiceTimeRecord.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TServiceTimeRecord.java
@@ -20,6 +20,24 @@ public class TServiceTimeRecord {
private Integer memberId;
private String foreignId;
private Integer endType;
+ private Integer goodId;//服务id
+ private Boolean isUpdate;
+
+ public Boolean getIsUpdate() {
+ return isUpdate;
+ }
+
+ public void setIsUpdate(Boolean isUpdate) {
+ this.isUpdate = isUpdate;
+ }
+
+ public Integer getGoodId() {
+ return goodId;
+ }
+
+ public void setGoodId(Integer goodId) {
+ this.goodId = goodId;
+ }
public Integer getEndType() {
return endType;
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java
index 7f33fe1..b17639a 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java
@@ -21,6 +21,15 @@ public class TServiceTimeRecordQuery extends BaseQuery {
private String foreignId;//
private String patientId;
private Date gEndTime;
+ private Integer goodId;//服务id
+
+ public Integer getGoodId() {
+ return goodId;
+ }
+
+ public void setGoodId(Integer goodId) {
+ this.goodId = goodId;
+ }
public Date getgEndTime() {
return gEndTime;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index 7a6a41a..1e885d3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -152,10 +152,10 @@ public class PatientServiceFacade {
if (hsc != null) {
String docId = hds.getDoctId();
Map dmap = new HashMap();
- dmap.put("doctorId",docId);
- dmap.put("doctorPrice",hds.getDoctPrice());
- dmap.put("devicePrice",hds.getDevicePrice());
- dmap.put("deviceCon",hds.getDeviceCon());
+ dmap.put("doctorId", docId);
+ dmap.put("doctorPrice", hds.getDoctPrice());
+ dmap.put("devicePrice", hds.getDevicePrice());
+ dmap.put("deviceCon", hds.getDeviceCon());
hsc.getDoctIds().add(dmap);
}
@@ -169,13 +169,11 @@ public class PatientServiceFacade {
List